auto merge of #913 : jmesmon/cargo/forgive-wierd-triples, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 20 Nov 2014 17:44:22 +0000 (17:44 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Nov 2014 17:44:22 +0000 (17:44 +0000)

Trivial merge